Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 16 Aug 2011 20:16:31 +0000 (13:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 16 Aug 2011 20:16:31 +0000 (13:16 -0700)
commit8679690f909767e118af4fc87a44b4c5e056b575
tree78f04a7b8832fab57d12cd1b29e2785e4e1bc7b4
parent24b4d08b95d14dd433ce49c44257d0a3f0be0aa5
parent470b3b9a63d568c76154eb485d7fee46876ef4a3
Merge from trunk.